Merged from gtk-2-10:

2007-03-15  Federico Mena Quintero  <federico@novell.com>

	Merged from gtk-2-10:

	* gtk/gtkfilechooserdefault.c (find_good_size_from_style):
	PANGO_PIXELS() gives us device units, which are *points* in
	pangocairo's parlance, but we want actual pixels.  So, get the
	screen's resolution to compute the actual number of pixels.
	Fixes bug #418585.

svn path=/trunk/; revision=17530

diff --git a/ChangeLog b/ChangeLog
index 77670501ad161c75b50eeca21582ddd488b8b6dc..aed7a8d5defee6d8964033a610bb8fe909658ee4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-15  Federico Mena Quintero  <federico@novell.com>
+
+       Merged from gtk-2-10:
+
+       * gtk/gtkfilechooserdefault.c (find_good_size_from_style):
+       PANGO_PIXELS() gives us device units, which are *points* in
+       pangocairo's parlance, but we want actual pixels.  So, get the
+       screen's resolution to compute the actual number of pixels.
+       Fixes bug #418585.
+
 2007-03-15  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentmanager.c (gtk_recent_manager_add_item): Remove

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 27f45241e9130353d89fd76c1e3f5b962cb997d1..95d42b679a5a930ec7c7841f4f0b754d15166810 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -7134,12 +7134,24 @@ find_good_size_from_style (GtkWidget *widget,
   gint default_width, default_height;
   int font_size;
   GtkRequisition req;
+  GdkScreen *screen;
+  double resolution;
 
   g_assert (widget->style != NULL);
   impl = GTK_FILE_CHOOSER_DEFAULT (widget);
 
+  screen = gtk_widget_get_screen (widget);
+  if (screen)
+    {
+      resolution = gdk_screen_get_resolution (screen);
+      if (resolution < 0.0) /* will be -1 if the resolution is not defined in the GdkScreen */
+       resolution = 96.0;
+    }
+  else
+    resolution = 96.0; /* wheeee */
+
   font_size = pango_font_description_get_size (widget->style->font_desc);
-  font_size = PANGO_PIXELS (font_size);
+  font_size = PANGO_PIXELS (font_size) * resolution / 72.0;
 
   default_width = font_size * NUM_CHARS;
   default_height = font_size * NUM_LINES;